fix-ARM-detection-in-set-soenv
authorDebian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Wed, 1 Aug 2012 08:41:17 +0000 (08:41 +0000)
committerRene Engelhard <rene@debian.org>
Wed, 1 Aug 2012 08:41:17 +0000 (08:41 +0000)
Gbp-Pq: Name fix-ARM-detection-in-set-soenv.diff

set_soenv.in

index 57927a029970675186622ca4238beef52cc09ea9..067f34b6b9a7d4243f8b1cb9184aa728b59922de 100755 (executable)
@@ -559,7 +559,7 @@ elsif ( $platform =~ m/linux/ )
       $JRETOOLKITDIR  = $JAVA_HOME.$ds."jre".$ds."lib".$ds."alpha".$ds."server";
       $JRETHREADDIR   = $JAVA_HOME.$ds."jre".$ds."lib".$ds."alpha".$ds."native_threads";
    }
-   elsif ($platform =~ m/^arm.*?l-/)
+   elsif ($platform =~ m/^arm.*-gnueabi.*/)
    {  print "Setting Linux ARM specific values... ";
       $oldoutfile     = "LinuxARMEnv.Set.sh";
       $CPU            = "R";